Return if edited_column is NULL, also grab focus before removing the

2001-12-10  Anders Carlsson  <andersca@gnu.org>

	* gtk/gtktreeview.c (gtk_tree_view_remove_widget): Return
	if edited_column is NULL, also grab focus before removing
	the cell_editable.

diff --git a/ChangeLog b/ChangeLog
index c2609f8f2f5c85dd28dceceff246e7007385eb05..f283cb3826e565c3a39b8db1a5129bcb9d7f2308 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-10  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_remove_widget): Return
+       if edited_column is NULL, also grab focus before removing
+       the cell_editable.
+
 Sun Dec 09 15:06:51 2001  George Lebl <jirka@5z.com>
 
        * gtk/gtkrange.c (gtk_range_calc_layout): check for 0 value on the

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c2609f8f2f5c85dd28dceceff246e7007385eb05..f283cb3826e565c3a39b8db1a5129bcb9d7f2308 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-12-10  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_remove_widget): Return
+       if edited_column is NULL, also grab focus before removing
+       the cell_editable.
+
 Sun Dec 09 15:06:51 2001  George Lebl <jirka@5z.com>
 
        * gtk/gtkrange.c (gtk_range_calc_layout): check for 0 value on the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c2609f8f2f5c85dd28dceceff246e7007385eb05..f283cb3826e565c3a39b8db1a5129bcb9d7f2308 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-12-10  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_remove_widget): Return
+       if edited_column is NULL, also grab focus before removing
+       the cell_editable.
+
 Sun Dec 09 15:06:51 2001  George Lebl <jirka@5z.com>
 
        * gtk/gtkrange.c (gtk_range_calc_layout): check for 0 value on the

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c2609f8f2f5c85dd28dceceff246e7007385eb05..f283cb3826e565c3a39b8db1a5129bcb9d7f2308 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-12-10  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_remove_widget): Return
+       if edited_column is NULL, also grab focus before removing
+       the cell_editable.
+
 Sun Dec 09 15:06:51 2001  George Lebl <jirka@5z.com>
 
        * gtk/gtkrange.c (gtk_range_calc_layout): check for 0 value on the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c2609f8f2f5c85dd28dceceff246e7007385eb05..f283cb3826e565c3a39b8db1a5129bcb9d7f2308 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-12-10  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_remove_widget): Return
+       if edited_column is NULL, also grab focus before removing
+       the cell_editable.
+
 Sun Dec 09 15:06:51 2001  George Lebl <jirka@5z.com>
 
        * gtk/gtkrange.c (gtk_range_calc_layout): check for 0 value on the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c2609f8f2f5c85dd28dceceff246e7007385eb05..f283cb3826e565c3a39b8db1a5129bcb9d7f2308 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-12-10  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_remove_widget): Return
+       if edited_column is NULL, also grab focus before removing
+       the cell_editable.
+
 Sun Dec 09 15:06:51 2001  George Lebl <jirka@5z.com>
 
        * gtk/gtkrange.c (gtk_range_calc_layout): check for 0 value on the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c2609f8f2f5c85dd28dceceff246e7007385eb05..f283cb3826e565c3a39b8db1a5129bcb9d7f2308 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-12-10  Anders Carlsson  <andersca@gnu.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_remove_widget): Return
+       if edited_column is NULL, also grab focus before removing
+       the cell_editable.
+
 Sun Dec 09 15:06:51 2001  George Lebl <jirka@5z.com>
 
        * gtk/gtkrange.c (gtk_range_calc_layout): check for 0 value on the

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index af9eef76416d88515aa41167b002943a4607dca5..c1e27f0e43e04e07cb0f6434bb88e2326af2bcc4 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -3107,6 +3107,7 @@ gtk_tree_view_focus_out (GtkWidget     *widget,
                                       GTK_TREE_VIEW_SEARCH_DIALOG_KEY);
   if (search_dialog)
     gtk_tree_view_search_dialog_destroy (search_dialog, GTK_TREE_VIEW (widget));
+
   return FALSE;
 }
 
@@ -9450,13 +9451,16 @@ static void
 gtk_tree_view_remove_widget (GtkCellEditable *cell_editable,
                             GtkTreeView     *tree_view)
 {
-  g_return_if_fail (tree_view->priv->edited_column != NULL);
+  if (tree_view->priv->edited_column == NULL)
+    return;
+
   _gtk_tree_view_column_stop_editing (tree_view->priv->edited_column);
   tree_view->priv->edited_column = NULL;
 
+  gtk_widget_grab_focus (GTK_WIDGET (tree_view));
+
   gtk_container_remove (GTK_CONTAINER (tree_view),
                        GTK_WIDGET (cell_editable));
-  gtk_widget_grab_focus (GTK_WIDGET (tree_view));
 }
 
 static gboolean